Merge commit 'EMACS_22_2' into deb/emacs22/d/sid/upstream
authorRob Browning <rlb@defaultvalue.org>
Wed, 26 Mar 2008 13:50:54 +0000 (08:50 -0500)
committerRob Browning <rlb@defaultvalue.org>
Wed, 26 Mar 2008 13:50:54 +0000 (08:50 -0500)

Trivial merge